MLE-24763 Merging master into develop #1018
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merging jsDoc changes from develop to master
…or port 8017. Add a second error message for test using SSL to confirm error when connecting to non-SSL REST service. Message probably changed for ML12 (not sure, but error message in test does not work).
…by default load of FIPS-forbidden MD5 digest algorithm. Incorporate the source from the abandoned www-authenticate project and fix in place.
…n another commit.. Delete and re-add existing www-authenticate files to www-authenticate-patched. Change path for require for requester and tests. Changes to www-authenticate will be in subsequent commit, for tracking
…eption on FIPS-enabled systems when the www-authenticate module is loaded via require. The MD5 digester functions are already created on demand when using DIGEST authentication. Use Buffer.from rather than deprecated new Buffer constructor form. Move the Parser_Authenticate_Info prototype statement to after the definition of the function. Add copyright to all the files.
…tements, unused variables, and move return note_error line outside of the for loop, which was probably intended.
rjrudin
requested review from
BillFarber,
anu3990 and
stevebio
as code owners
There was a problem hiding this comment.
Pull Request Overview
This PR merges master into develop to ease future integration. The only file change is the temporary retention of a Docker Compose configuration file that was previously deleted on develop, which will be removed in a subsequent PR.
- Temporarily restores
docker-compose-nightlies.yamlto enable the merge operation
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
Copyright Validation Results ⏭️ Skipped (Excluded) Files
✅ All files have valid copyright headers! |
rjrudin
force-pushed
the
feature/temp-develop
branch
3 times, most recently
from
1297946 to
53182d1
Compare
rjrudin
force-pushed
the
feature/temp-develop
branch
from
53182d1 to
543c619
Compare
BillFarber
approved these changes
Oct 27, 2025
|
No idea why Jenkins is hosed nor why GitHub is reporting merge conflicts. Something to resolve when we do the release. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will greatly ease the eventual merging of develop into master.
Oddly, I can't do this if there are no file changes - and there are no files to be changed. But I'm keeping this "nightlies" docker-compose file which was deleted on develop, just so I have a change, which allows me to do the merge. I'll delete it in a subsequent PR.